Merge "Update airplane mode key to match framework constant" into pi-dev