Restore tablet setting panel customization

Change-Id: I31d43230b2fe42b4d0ab0de373ba0f86b35e0db8