Merge "Clear overlay when swiping up to unstash taskbar." into main