Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev