Merge "Emergency dialer bottom margins" into oc-dr1-dev