Merge changes Ib6415145,Ifde98a8c

* changes:
  Adjust the location update frequency for emergency calls
  Fix issue that the connection icon is placed a little left from center