Merge "Make accessibility anchor id a long"