Merge "Updated toggles in Date and time settings page" into main