Merge "Add show/hide launcher icon menu for debug"