Merge "Fix system server crash when transition happened during predictive back" into main