Merge changes from topic "mobile_select_migration"

* changes:
  Fix compile error in NetwotkSelectSettings
  Copy NetworkSelectSettings to settings app