Merge "Fix NPE of extras in media metrics" into sc-dev