Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev