Merge "Fix broken statusbar disable flags" into nyc-dev