Merge "Avoid deadlocks when calling autoFocus from onAutoFocus callback." into jb-dev