Merge "fix QS header for new ConstraintLayout version" into tm-qpr-dev