Merge "mediaprovider: fixed sharedUserId bug"