Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev