Merge "Fixed a bug where the statusbar could become empty" into nyc-dev