Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev