Merge "Fix shader issue during Animation & UPDATE_PROPERTY action" into devel/master