Update notes for submitted changes

* Fix NPE if themeContext is null - round 2