Merge "Avoid NPE when quickly toggling USB debugging state"