Merge "Fix MSIME client's active state"