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

* commit '91ff85da1a2a106c8ddb5e204928e0d6ef094283':
  Fix touch intercept bug in ResolverDrawerLayout