am 30373c5b: Reconcile with jb-mr2-release - do not merge

* commit '30373c5b5b44953ebc03e0a0523efd1b42557ebf':
  Finish any event in the current input queue
  Prevent crash when a single layer is enqueued several times for updates Bug #8504687