Merge "Don't take a lock on the UI thread"