Merge "SurfaceFlinger: align init and resume mode priority" into rvc-dev