Merge "Allowing ACTION_CANCEL events to come from device 0" into main