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

Change-Id: I48710a6b2b37827ab78285d9767e6368d481e830