[Migration] Conflict Fix: ctxpopup, diskselector, flipselector, spinner, tooltip...