Merge \\"Suppress immersive mode confirmation if navbar is empty\\" into nyc-mr1-dev am: 2061ff11c4
am: 2149506068

Change-Id: Ia637f2f45fe31778b2eabd2719cd6de0af27f1f6