Merge "Avoid changing z-order of overlay layer after resizing display" into udc-qpr-dev