Merge "Fix Notification animation controller memory leak" into udc-qpr-dev