Make note editor work with payment comments again

Change-Id: Idda36c5d2449dfb2f9e14243fdd9fa876002e52a