Merge "Revert "Remove overlay logic from package manager and parser"" into qt-dev