Merge "Disable FolderNameEditText on Taskbar" into sc-v2-dev