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

Change-Id: I02749680543382edd449bdcda0775d9b7d6e87e4