Merge "Camera: Fix condition check for Performance Class" into tm-dev