Update notes for submitted changes

* ThemeEngine: Unsolved conflicts while rebasing gerrit commit