Merge "Move media expiration to MediaDataManager" into rvc-dev