Merge "Fix NPE in FloatingIconView" into sc-v2-dev