Merge "43194: Fix NPE when preferred avd is null"