Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev