Merge "Simplifying taskbar recreation logic" into udc-qpr-dev