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

Change-Id: Ied0ef6008d49384dfb9f4f91d9d2750b971cf281