Merge "Fix usages of PUBLISH_STATE_OK"