Merge "Revert "mediaprovider: fixed sharedUserId bug""