Merge "Disable status bar indicator icon" into sc-dev