Merge "Revert "Use compat framework to gate session actions"" into tm-dev