Merge "Cache resources needed to sort media sizes." into nyc-dev