Merge "[DO NOT MERGE] Unify QS Headers in a ConstraintLayout" into sc-v2-dev