Merge branch 'rotate-portrait-images' into 4.2