am 5006eb75: Merge "Null not handled when parsing media size resource id attribute." into klp-dev

* commit '5006eb75e6d42ac107734fa8134a726158d768d8':
  Null not handled when parsing media size resource id attribute.