Merge "Revert "Update show system experiment behavior."" into tm-dev