Merge "Remove Taskbar and Taskbar EDU flags." into tm-dev