Merge "overlay: Align width to 4 multiple in case of 90 degree rotation."