Merge "Enable some CM options by default" into cm-10.1