Merge "Include pending media as well when deleting mediastore entries." into rvc-dev