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: ce74f50e
Change-Id: I75da1342d367b2dd90501e71226d0bd69f29463b