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

Change-Id: I43b583256b5975ca1206c9474bd64ee56e2419b0