Trivial cleanups
Added sanity check for mediaItemId to exclude locally created MediaItems (MP2-348)