Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev