Merge "allow phone error messages from lock screen" into tm-qpr-dev