Merge "3-button mode tests for rotation tests" into sc-dev