Merge "Adding NORMAL_STATE_ORDINAL" into ub-launcher3-master