Merge "Fix constraints for collapsed layout" into tm-qpr-dev