Merge "Make Go To Declaration work for theme references"