[automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev am: 10d9320c3a -s ours
am: e698002e22 -s ours
am skip reason: change_id Ida5f83e626c82266de69b13dc2def0477cc87b0f with SHA1 26a6427c44 is in history

Change-Id: I6e0311852015edd916b65e3ac0e4a8930c366a3d