Merge "Fix sysui predictive back not working after navigation mode change" into main