Fix bug in screen capture and lock task migrations

Bug: 318497672
Test: manual
Change-Id: Id0ac7d06b57f690d114217f2a34c2a1e8c60a277
4 files changed