Merge "Revert^2 "Update ConstraintLayout to 2.2.0-alpha05"" into tm-qpr-dev