Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev
am: 1fefc8b9fa

Change-Id: I57af7dceec243b6befbaa293438d6239053bb0ed