Merge "Fix improperly terminated <em> in night mode method Javadocs" into main