Merge "Added back code removed earlier from OverviewInterationState" into ub-launcher3-master