Merge "Better diags and a small correction for scrolling in AllApps" into ub-launcher3-master