Bugzilla/1062819 pickup rebased/mobile connection core

and `restoring enabled settings`