am 4b0764ee: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '4b0764eef22e3244d3f45fbda1e093ff11986f5f':
  Fix notification gestures.
  Single finger notification expansion.