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

* commit '67af29f6d642c3c578ee1b5af70dc525955982a5':
  Fix touch intercept bug in ResolverDrawerLayout