Merge "Fix a custom shader issue in ImageView" into devel/master