Merge "FP2-413: adjust where the WIFI icon is displayed in airplane mode" into fp2-dev-v2