Merge "Center taskbar nav buttons in small screen" into udc-qpr-dev