Merge "Track window for 2 button nav as well as 0 button" into ub-launcher3-qt-dev