Merge "Cleaning up some old animation code, only setting view properties that have changed."