Merge "Revert "Camera: Fix preCorrectionActiveArraySize check""