Change-Id: I8acc59b2446a13c8f7fe3a6bdf090f39d4896b1f Jira: STUDIO-8859 (cherry picked from commit d723fa714f34d572052b5cae0847472529f2c62f)