Merge "Match SFPS Keyguard color to the bouncer secondary color" into tm-qpr-dev