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
Change-Id: Ifb4be2534f3c8f88b5745802a4e51ad3cf964f93