Merge "Add utility for toggling settings from the cmd line." into gingerbread