Merge "Fix double status bar icons" into nyc-dev