Merge "Only force drawing status bar background if target >= N" into nyc-dev