Merge "Fix drawing focus node rect in touch mode"