Merge "Update keyguard mic icon to rounded" into oc-dr1-dev