Merge "Make sure we honor canChildScrollUp()" into mnc-ub-dev