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: 93db5310 am: a2f3dabf
Change-Id: Ic4eebd06e92eaab9a7a83ee1753b15b6772e018a