Merge "Log events during PS setup flow." into main