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