Merge "Update the prefered size in OnNotifyDefaultPropertyAnimation" into devel/master