Merge "Update airplane-mode manipulation for the new Settings namespace" into jb-mr1-dev