Merge "Set SECURE_FRP_MODE for backward compatibility on deactivation" into main