am 91ff85da: am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev
automerge: ea12691

* commit 'ea12691338cba1d3b6547b6eefb52388f1ed4a28':
  Fix touch intercept bug in ResolverDrawerLayout