Merge "Fix screenshot_static ConstraintLayout" into tm-qpr-dev