Merge "On device lockdown, always show the keyguard" into sc-v2-dev