sync MainMenuActivityTest with master