Merge "Fix for the toggle airplane mode hidden API" into klp-dev