Merge "QCamera2: Add param lock in getParameters"