Merge "keymaster: avoid deref'ing nullptr"