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

Change-Id: I439fa789a76ef2473f7e5540ab6eccc586f33658