Merge "Change settings style to non AppCompat" into nyc-dev