Merge "Keystore2: Stop using WAL mode" into sc-dev