Merge "Separating predictionrowview into a separate layout file." into ub-launcher3-master