Merge "Clip folder chidren during folder open/close animation" into udc-dev