Merge "Only remove overlay reference once it is faded out" into main