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

Change-Id: I40a39895abd22f191333bfe29d5d3142532dd761