Merge "PIN/PUK Views not showing after boot" into sc-dev