Merge "Revert "Make subsettings display edge-to-edge"" into qt-dev