Settings initial data reorganisation

Change-Id: I910d059504f96561102a90b8542f68a0a2ec9296
Merge "Settings initial data reorganisation"