Merge "Allow letterbox repositioning only when filling of parent dimensions" into tm-qpr-dev