Update notes for submitted changes

* Keyguard: remove duplicated code