Merge "Fix NPE inside getFocusdChild" into ub-launcher3-master