Make Tabbed Settings changes stick

Change-Id: I9bba9c9947b6a25b3f7368f9c400d2b19e9d37b5