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

Change-Id: Ieb4b6a6afdbf308e521480ad1bf72c30da19e2f3