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

Change-Id: If063b1fb2c850dd2db8dafa6df0ddcdadfeada6c