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

Change-Id: I0640c755f173482011cd93562df02c0d93a1e301