Merge "Retain empty shade visibility on reinflation" into main