am f114e3d9: am b1ad8e9e: Merge changes from topic \'tron\' into mnc-dev

* commit 'f114e3d92df4fa8035f7e2722d5e653e9a27624f':
  remove unused edge border dimension.
  log clear all button