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

Change-Id: I78bcd94799ce3e06a12f06297ef2b98ebf723cfb