Settings tab fixes

Closes-Bug:#1339652

Change-Id: I44e4e8e4ed46c123aa5f022ddaa2605642d2d171
Merge "Settings tab fixes"