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 am: 5ad032a5
Change-Id: I006bb6a495aa953b184f0b5d63bcdad0ac116c7a