Merge "[flexiglass] Pick up on non-secure auth method changes." into main