Merge "Fix prevent issue - pixbuf might be NULL" into devel/master