Merge "Only update overlays for target" into qt-dev