Merge "Fix ANR caused by hwuiTask thread"