Merge "Fix sim status screen" into nyc-dev