Merge "Handle null extras for MediaDescriptions" into tm-qpr-dev