Merge "Added checks to make sure FUL functions are on UI thread" into jb-dev