Merge "Fix TaplTestsTaskbar" into udc-dev