port additional settings from jellybean 4.1