Merge "Merge "New keyguard icons" into oc-dr1-dev am: 6df24d2f42 am: 45cab06322 am: 3d28a65d79"