Merge "ResolverDrawerLayout to request layout when needed." into tm-qpr-dev