Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev