Merge "allow phone error messages from lock screen"