Merge "Revert "Set correct focus activity when using FLAG_ACTIVITY_REORDER_TO_FRONT""