Merge "Fixed a bug with the collapsed media template" into nyc-dev