optimize media_edit activities query
Merge branch 'master' into RELEASE_20140325