Merge "Refactor taskbar divider view to IconButtonView" into udc-qpr-dev