Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev