Merge "Reduce the amount of I/O done on the UI thread." into jb-dev