Merge "don't compute outside of visible range" into qt-dev am: 3a477180f4 am: f4dd720828 am: 6b4b45d1fa
am: d6e046e26a

Change-Id: I95015e9b7fa4ca912161ee09813b17f1ab78e296