Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev