Merge "Remove platform key when user disables lock screen protection"