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

Change-Id: I79f0d23f619ffb4712fdde2a948eea32dcce2cce