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