Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev