Merge "Changes on Settings UI for a better user experience"
am: 7737b64159

Change-Id: I591b6eac611109bd903c99f79ecd63d37ca59511