Merge "Remove Change Navigation Mode option for Taskbar Divider Popup Menu" into udc-qpr-dev