Merge "Back up Force Bold Text setting and clean up javadoc"