Merge "OMS: always update overlays.xml when overlay is removed" into qt-dev