Merge "Adding missing break statements causing crash on MSG_SET_EXTRAS." into nyc-dev