Merge "Removing left over experimental overlays and frame width (1/2)" into qt-dev