Merge "Fix empty account labels in airplane mode" into nyc-dev