am dc23178b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'dc23178be51dc97c05eab0504a91d0c0beb75806':
  Temporary fix for qsb and hotseat clicking issues