Merge "Fix rendering of policy transparency activity." into nyc-dev