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