Merge "Only notify prepare-surface callback from window animator" into main