Merge "Fix loading VVLs by surfaceflinger service" into main