Merge "Guard against app info crash" into nyc-dev