Merge "Misc. media API changes" into klp-dev