Merge "Return complete properties map instead of per view" into nyc-dev