Merge "Add a hint to align changes between taskbar and divider bar" into udc-dev