Merge "Add setHasTopUi(true) during cross-activity and cross-task predictive back" into main