Merge "Only abort activity options when failing to bring a task to front"