Merge "Animate overlays when enabling/disabling them" into main