Merge "Polish up metadata propagation for native window" into tm-dev