Merge "Move all onHandler methods into ServiceState" into main