Merge "don't compute outside of visible range" into qt-dev am: 3a477180f4 am: f4dd720828 am: 643e29bd93
am: 2cf6238238

Change-Id: Id9663ab4252e14b309ec7ace55d747c8e7ba9141