Merge changes from topic "RenderArea" am: 3b14b7db6f
am: 445c7b3640

Change-Id: I9561e2f4a475e7e0778dbfde23bc2d682ceff8a9