Merge "3-button mode tests close app tests" into sc-dev