Merge "Add SysUI flag notification_clearable_refactor" into udc-qpr-dev