Merge changes If884d5a1,I2a28d025

* changes:
  Relax number matching when coalescing rows in new call log.
  Move onUiShowing() call from onResume/onPause to onStart/onStop.