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 am: a2f3dabf am: 15ea5858
Change-Id: I89043130338544a6dde211fab82fcc79483c96d6