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

Change-Id: I1d07e84360ef0bfeb6b0ce41466e4042ca70ad81