Merge "Merge lock blocks around IMM#checkFocusInternal()"