Merge "Allow nullable locking directory in SupportSQLiteLock." into snap-temp-L60900000959093030