Merge "Adding Support for Change Navigation Mode Taskbar Divider Menu Option" into udc-dev