Merge "Unexpected state change for Other category service" into main