am 8a64b1a7: Handle airplane settings properly

* commit '8a64b1a7f4b07e71b9eb0f4a98710cb1409588bf':
  Handle airplane settings properly