Merge "Added footers to zen mode settings"