Merge "Fix AppMemoryPreferenceControllerTest" into main