Merge "EncoderColorAspectsTest: Limit surface mode tests to T launching devices" into tm-dev