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