Merge "Handle negative view types properly in getScrapView" into mnc-dev