Pre rebase home-local changes
Add capture pin dlg and layer-mapping to settings

- Project layer tracking broken