Merge "Removing LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING flag" into main