Merge "Add flag to skip restoring network seletion." into gingerbread