Merge "Number of DEBUG_STATES was 1 less than necessary" into ub-launcher3-master