- CherryPick Merge from Develop: fix ImageEditor not showing image