Merge "Reduce unnecessary surface operation of setting trusted overlay" into main