Merge "Change to enable search tests on T+ devices" into main