Merge "Merge "Revert "don't compute outside of visible range"" into qt-dev am: e4d9618d am: 3d623d54 am: d3155ce3" into qt-qpr1-dev-plus-aosp