Merge "Logging improvements for notification views" into udc-dev