Merge "Remove key from adb_keys if user forgets the key." into rvc-dev