Merge "Fix issue where Launcher was not getting redrawn"