Settings improvements

Closes-Bug:#1323749
Related-Bug:#1314613

Change-Id: I8e1824d3086d3e7362e5c12d25e29a79437accac
Merge "Settings improvements"