Merge "Code cleanup in Zen Mode Settings"