Merge "Forward developer settings intent to primary profile" into main