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

Change-Id: I512dbe859db4da3690016f3ea52a872b6c7b5147