Merge "Notification app screen updates"