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

Change-Id: Ic6ef76c7abdcb42c3e83824ec53de6282d172902