Merge "Allow smart unlock right after boot."