DO NOT MERGE -- Adjust focus when moving task back am: d4b98705b5
am: 75cd6ef5dc

Change-Id: I07746c065e749549c7a30820f10f24945b30c760