Merge "Animate badge after folder closes" into ub-launcher3-dorval-polish
am: b37200637d

Change-Id: I006e7520aa2b9559565c356af6021e2be0786fff