Merge "Fix scrim flashing when no security is set."