AS Preferences Update

You can merge this directly to get ALL the changes (Android Studio conversion AND the Preferences update) or you can merge the Android Studio Conversion request first, and then this one if you want two separate pulls.