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

Change-Id: Ied3c4bcbd5d772d3573788fd678aca50e3442923