Merge "Allow soft AP settings config before bring up" into gingerbread