Merge "Change MediaSet.reload." into gingerbread