Merge "Fixed navigation bar to show itself after creating a new user through...
Merge "Fixed navigation bar to show itself after creating a new user through keyguard ui." into rvc-dev am: 628f2eea am: 313e484f am: 7e7e434e
Change-Id: Ia33db916860404936b3b3ee1c0c3a71a2ec31873