Merge "Restore "view" argument for notification remote view click handler"