Merge "Use correct menu key highlights for safety center" into tm-qpr-dev