Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev am: 6e4f6ecbab
am: 618b3cb6fa

Change-Id: I3c47a26f5f10bd271277a974b81697913f612762