Merge "Update hole punch logic in HWUI" into sc-dev