Merge "VE: Use different approach for transparent text issue"