Settings dashboard tablet fixes

Change-Id: I21b306f6932af4fc2c5b79feeba60cdd820e2b8a
Fixes: 27834674
3 files changed