Merge "Fixing crash in Launcher in portrait mode"