Merge "Fix bug in screen capture and lock task migrations" into main