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

Change-Id: I2862387d1cc18fb8536ed1a1e1c9441b64395977