Merge "Don't make redundant launch while updating configuration" into nyc-mr1-dev