Merge "[LayerTypeTransactionTest] Remove captureDisplay" into main