Merge "Ensure SAVE_APP_PAIR is only used for GroupedTaskView" into main