Merge "Fix setState with the current state" into mnc-ub-dev