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: I5456627d4a78d7f5dc7741ef8336920b5ad006e2