Merge "Move set work lock message from header to footer" into tm-dev