Merge "Fix prevent issue - animatableProperty might be null" into devel/master