Merge "Fix issue where navbar wouldn't be on lock screen" into qt-dev
am: 3d4796f452

Change-Id: Ibc3a7dc3598c27f16412d9b668b59b85a920f969