Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev