Merge "Merge "Revert "Remove overlay logic from package manager and parser"" into qt-dev am: b73580d2fa am: d693e93482"