Merge "Fix smart selection logging bugs."