Merge "Fix overlapping FloatingViewType IntDef"