Fix problem with onCompletionListener-- must be called on a ui thread.
Merge remote-tracking branch 'origin/master'