Merge "Wallet - Listen for setting changes" into sc-dev