Merge "Use secure setting for secure windows on keyguard" into main