Merge "Use ConstraintLayout for screenshot UI" into rvc-dev am: 91382f3d00 am: b32f7be6a7

Change-Id: I6ab9fa02844eff65335d42f7c8e93f4a5a2a55ef