Merge "New keyguard slice data structure"