Merge "Revert "Enable media session flag by default"" into tm-dev