Merge "Fix ResolverDrawerLayout child measurement" into tm-dev