Merge "Refactor airplane mode preference controller." into pi-dev