Merge "Set correct divider dimension for task menu options" into sc-dev