Merge "Guarding ACCESS_SMARTSPACE with a flag" into main