Merge "Load user icon on bg executor" into main