Merge "Use the measured height in the ResolverDrawer"