Merge "Use ConstraintLayout for screenshot UI" into rvc-dev