Merge "OomConnection: Verify memory listener state" into main