Merge "App transition delay tracking" into nyc-dev