Merge "Fix Smartspace media logging bugs" into sc-v2-dev