Added option to enable/disable AOSP mode