Merge "Synchronize ResolverDrawerLayout with core" into tm-qpr-dev