Merge "Add advancedFeatures.ini.desktop for Desktop AVD." into main