Merge "Don't force disable icons when app is fullscreen"