Merge "VRR: Allowlist for small area detection" into main