Merge "Properly label app as unregistered and add NPE protection" into nyc-dev