[automerger] Fixing crash on keyboard shortcuts popup am: 3455f8d0f6

Change-Id: Ib63e65cbd785fc980fb180c95a98ba253af78558