Merge "Add system option to disable lock profiling"