Merge "Do not switch to screenshot and finish recents animation for menu options that already do so" into sc-dev