Merge "Track shelf rather than app window" into ub-launcher3-edmonton-polish