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

Change-Id: Ifb74fde49d4f0d3f1aa5b6f16684bac27ef625d6