Merge "Allow updating the flyout message" into main