Merge "Update the custom shader effects to resize the geometry" into devel/master