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

Change-Id: Ic6ca98ce0f8511a99b851e9e8927fda975d6b8b3