Merge "Fix a UI bug in rendering a rotated image."