Merge "Opt-in predicitive back before register the back button" into main