Merge "Use ConstraintLayout for screenshot UI" into rvc-dev am: 91382f3d am: b32f7be6 am: 2076e46a Change-Id: I023e7ab37e4aec676c27672619b6771d28aef153