am 48ff7c75: Reconcile with jb-mr2-release - do not merge

* commit '48ff7c754131a9b3f08f4e83106dfb8f0c1a5743':
  Fix crash in draw listener