Update notes for submitted changes

* General cleanup and aapt warning fixes.