Merge "Fix overlapping FloatingViewType IntDef" into ub-launcher3-master