Sample update, custom view support improvements.