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