am 22d2575c: Merge "Adding more standard media sizes." into klp-dev

* commit '22d2575c3eb5e2154bcb344372711bafc2e0b3d3':
  Adding more standard media sizes.