Merge "fix race in app blocking during bootup" into nyc-car-dev