Merge "Split AFVs that controller should not intercept from TYPE_ACCESSIBLE." into main