Merge "Fix potential NPE when looking up view tags for animating" into udc-dev