Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev