Merge "Revert "don't compute outside of visible range"" into qt-dev am: e4d9618d67 am: 3d623d54f2
am: a824053914

Change-Id: Ia1a3345167c1527533179de106abf7d0bfbd7201