Merge "don't compute outside of visible range" into qt-dev am: 3a477180 am: f4dd7208 am: 643e29bd am: 2cf62382 Change-Id: Id9663ab4252e14b309ec7ace55d747c8e7ba9141