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

Change-Id: I4db7bc8da2d534aad9302fb7d8758487f21d109d