Merge "Overlay a highlight over autofilled views" into oc-dev