Merge "[Notif] Write AppUid earlier in NotificationInfo" into pi-dev