Merge "Cancel predictive back when sliding off back button" into main