Merge "Address API council feedback for onSecureWindowShown" into main