Fix back swipe causing modal to always close on Chrome Android

On Chrome on Android, if you click through different modals and then try to go back, it will just close the entire modal instead of going to the previous modal.

I also noticed that the modal flashes for a moment after closing.