Merge "Reduce acquiring WM lock when ANR happens" into udc-qpr-dev