Merge "Revert "Fix broken TaplTestsTaskbar splitscreen test cases"" into udc-dev