Merge "Remove AllAppsState history override." into main