Merge "Pass through both the widget's pendingIntent and remoteView intent" into main