Merge "Emergency dialer grid" into oc-dr1-dev