Merge "Fix notifications wrong corners after "clear all"" into udc-dev