Merge changes I1d00d86e,I16d81113 into oc-dev

* changes:
  Silence non-clickable imagebutton
  Remove log spam