Merge "Update ApiDemos to use new input source check" into jb-mr2-dev