DO NOT MERGE -- Use focused activity value when moving task back am: da3b648b64 am: 39be2e91ca
am: 870489e97e  -s ours

Change-Id: I303e8404cb6888618a9d5d4d05b7ff481f07bcfe