Merge "ResolverDrawerLayout: unify mCollapsibleHeight calculation." into tm-qpr-dev