Merge "Add API demo for a custom layout." into jb-mr2-dev