Merge "base: Add support for window ignore secure [1/2]" into 15.1