Merge "Fix java crash for cross task and cross activity back" into main