Merge "Fixing NPE when animating bounds."