Merge "LockSettings: fix the get password issue during boot up"