Merge "Make sure that external callers cannot pass in the confirm bypass extra" into klp-dev