Merge "QS: Don't set flashlight state when we don't have an id" into nyc-mr1-dev