Merge "Properly marking TaplTestsSplitscreen with test annotations" into udc-qpr-dev