Merge "Cleanup ENABLE_TASKBAR_POPUP_MENU" into udc-dev