Merge "Separate 2-button mode check from ENABLE_OVERVIEW_ACTIONS" into ub-launcher3-master