Merge "Adding more standard media sizes." into klp-dev