Merge "New ListKeys API in syncstorage"