Merge "Update OutputTest due to DisplaySettings changes" into tm-dev