Merge "Fix bug where Launcher would appear all black"