Merge changes from topic "RenderArea"
am: 3b14b7db6f

Change-Id: I6eea9c398eae9b8f67e20eb115e644bb0f7dd481