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

Change-Id: Icea198f4b16c3031aae16f20436804ce9c15e7e0