Merge "Move task focusing activity task to the front when we focus on the stack"