Code cleanup in Zen Mode Settings

Changes in response to code review from automerged commit ag/3171711

Test: make -j40 RunSettingsRoboTests
Bug: n/a
Change-Id: I5df3db4e8ff421ca9911c84ae3f621a0e3d08092
14 files changed