Merge "EmergencyCryptkeeperText: Make sure we update if airplane mode changes" into nyc-mr2-dev