Merge "Fixed an issue where the icon wouldn't disappear after launching"