Merge "Alert Windows behavioral changes"