Merge "Allow disabling layer rotation during screenshots"