Merge "Refine clearsCompatInsets" into udc-qpr-dev