Merge "Fixing folder icon in landscape, issue 5135333"