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

Change-Id: Ia62c17d7ffc636be442abc4f95f4c3699dd2f604