Merge "Abort or throw SecurityException if intent redirect detected" into main