Merge changes from topic 'tron' into mnc-dev

* changes:
  remove unused edge border dimension.
  log clear all button