Merge "Fix split caused apps ANR" into sc-v2-dev