Merge "Fix flickers when invoking overview transition during predictive back-to-home" into main