Merge "Updated visual property animator to handle shader properties" into devel/master