Merge "Remove placeholder namespace for media_solutions flag" into main