Work in progress on the settings

Commits curretn work in progress. Updates bundles from
"Android-settings" jitsi branch.