Merge "Change start/stop lock-task-mode to two way binder" into main