Merge "CTSVerifier bubble height tests" into sc-dev