Merge "SF: fix a crash in SurfaceFlinger::setActiveModeInternal" into sc-v2-dev