Chaning the behavior of settings activity.
am: 745bad9da1

* commit '745bad9da1ef2fca2ab7bfeb5ea885a2b50c49c3':
  Chaning the behavior of settings activity.

Change-Id: I7435ceffed5b64a44fe50c65ba6bde8ecc33e13f