Merge "Remove the state when forcefully remove overlay" into main