Merge "Camera: Fix race condition for filterSPerfClassCharacteristics" into sc-dev