Merge "Avoid killing task process after its activity was died" into main