Merge "Changes on Settings UI for a better user experience" am: 7737b64159 am: 97cb71e978
am: 309d86f613

Change-Id: I47d4fba4fddb44c270b37f590c86b736d2ca5271