Merge "Fix the bubbles expansion animation" into udc-dev