Merge "Correct label position after rotation" into gb-ub-photos-bryce