Merge "Allow child layers to unset trusted overlay state 2/2" into main