Settings tab fixes

Change-Id: I00b9adb09a87a05bf980761710eddf6992a3e39a
Merge "Settings tab fixes"