Merge "Add TestApi to suppress other LightsSession clients" into sc-dev