Merge "Update the categories of app kill reaons" into rvc-dev