A couple of additional points that may help -
1. When asked about the batteries, I simply stated they were for a camera - "OK, they are fine." was the response every time.
2. I took the props off the Mavic and packed them separately in my hold baggage. That way, if really scrutinised, you can...