Merge "Use user context when loading pip menu icons" into main