Merge "Rename the Smartspace media recommendation layout to avoid potential mismatch." into sc-dev