Merge "AM: fix bug in moveTaskToBackLocked due to LockTask"