Merge "Add ability to listen to LockTask state changes" into sc-dev