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

Change-Id: I56995f1b7239f4b3bb1a81c46891af04016561f0