Merge "Adds a launching activity flag to WearableExtender in NotificationCompat" into nyc-dev