Merge "Fix Display Notification template reference to ic_launcher" into studio-1.3-dev