Merge "Update the initial bouncer message whenever the security mode changes" into main