Merge "Skip restore of apps that have been launched or restored." into main