Merge "Create snapshot even if no PendingIntent is registered" into pi-dev