Resolve merge conflict
Some change
Merge remote-tracking branch 'origin/master'
merge from master
Merge remote-tracking branch 'origin/master'
Update: move ui processing to the main thread