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

Change-Id: I3d497290a27a0c1f312ca5c3eb5cdf140af4e34d