Merge "New keyguard icons" into oc-dr1-dev