Merge "Do not switch minor/major alerts"