Merge "Updating widget prediction handling:" into tm-qpr-dev