Merge "media: Silence an analyzer complaint; clean up code"