Merge "Forward WiFi settings intents to primary profile" into mnc-dev