Merge "Write the airplane setting in addition to sending the Intent." into jb-dev