Merge "Suppress immersive mode confirmation if navbar is empty" into nyc-mr1-dev