Merge "Tint keyguard icons"