Merge "Hide overlay if the overlay was shown when Meta key is tapped." into main