Fix conflicting as.xml busy dialog patch
Fix conflicting RPi patch