Merge "Minor refactoring of FloatingHeaderView and PredictionRowView." into ub-launcher3-master