Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev